Resolve merge conflict
Working on resume
Update Resume with advice from Tony
Projects page
Tweak labs layout
Fix robot image
Merge projects redo