Test
Merge branch 'master' of https://github.com/AkermanGreg/happy

Fixing Merge
Some routes, homepage
Merge branch 'master' of https://github.com/AkermanGreg/happy

"Route Changes, updates to homepage"

:q
Merge branch 'master' into greg

"homepage updates, route changes"