idk what im doin doe
Merge branch 'master' of https://github.com/tinazheng/gym
idk i did some stuff and its like working or something. im not really sure.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Http/routes.php
	public/app/services/gymUser.js