creating api...
Merge branch 'master' of github.com:keiteio/favostagram

Conflicts:
	app.rb