worked
2
Merge branch 'master' of https://github.com/zackpatterson/RampUp

Conflicts:
	back/config/application.config.php
	back/public/app/index.html
	back/public/app/scripts/app.js