my changes
Merge branch 'master' of https://github.com/robket/squirtle
Merge branch 'master' of https://github.com/robket/squirtle
working navigation
cleaned up home