init
Merge remote-tracking branch 'origin/master'

Conflicts:
	example_mashape_flask/app/views.py