added flags
Merge branch 'master' of github.com:kirbyk/snapwall

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css