wip
Merge branch 'master' of github.com:kareemsabri/launch-back

Conflicts:
	models.rb