I made the website -- awwwwyeaaaa
pulled julie's changes
Julie and I just made the rest of the site
fucking merge errors
Lots of changes from Friday at the hive
Just a commit
Secondary commit
jquery menu is now added
Merge error
Header changes
Template changes for sub-menu
the real good template
Merge branch 'patrick' into dev
Julie's interior page changes and my CTA file seperation
Merge error FUCKING AGAIN
Another nights work on the hive site
merge error
Random Changes
merge error
Another night worth of dev