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

Conflicts:
	app/assets/javascripts/application.js