Add bootstrap and modal
Merge branch 'master' of https://github.com/kirbyk/snapwall

Conflicts:
	app/assets/javascripts/application.js
Merge branch 'master' of github.com:kirbyk/snapwall into staging
merge
added flags
Merge branch 'master' of github.com:kirbyk/snapwall

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
delete flagged snap
Merge branch 'master' into staging

Conflicts:
	app/assets/stylesheets/application.css
	app/views/snap/index.html.erb