Merge pull request #28 from worldmentr/dbecker215

Dbecker215
no message
Merge branch 'master' of github.com:worldmentr/capstone into j-garcia-0788

Conflicts:
	app/routes.php
Merge pull request #30 from worldmentr/j-garcia-0788

J garcia 0788