Checking in
Checking in
Fixing navigation.js
Fixing navigation.js
Refactoring SCSS
Merge branch 'master' of https://github.com/doughamlin/Touchpoint

Conflicts:
	readme.md