Auto Deploy
Rearrange SCSS
Merge branch 'master' of github.com:themcstaplez/staplez-io

* 'master' of github.com:themcstaplez/staplez-io:
  Auto Deploy

Conflicts:
	app/routes.js