endpoints
Merge branch 'master' of https://github.com/octopi/sneak-peek-app

Conflicts:
	app.rb