front-end routing set up & devise merging
Merge branch 'master' of github.com:jassicacanidy/CallistoReinvented

Conflicts:
	.DS_Store