bad
Merge branch 'api' into develop-ricky

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
Merged API
No need to wait 1/4 second every test