Merge pull request #2 from ksalmon/main_nav

Main nav
gallery links
Merge pull request #3 from ksalmon/index_frontend

gallery links
loading js issue
Merge branch 'master' of https://github.com/ksalmon/aoh into index_frontend
compile assets
controller markup
sample collection
Merge pull request #4 from ksalmon/index_frontend

sample collection
merch section
footer
viewport mobile
footer
featured section
viewport mobile v2
index style
article intro
Merge pull request #5 from ksalmon/articles

article intro
article nav buttons
Merge pull request #6 from ksalmon/articles

article nav buttons