Eric and I working on wave 3 of the gift cards project. We broke a huge project down into 3 smaller waves to help relieve the dependencies that were built into the project. Lot of application-level stuff, session stuff, and cached server objects and views. Testing and reviewing code. We had to fix some merge conflicts. This branch (the new code) was started months and months ago. That sometimes makes for a number of merge conflicts. We also spent some time picking up missed files and rebuilding the needed assets. We had had some code repository issues with this branch. Good work session.