Bootstrap column intergration
Merge branch 'master' of github.com:deviowa/ImageSpotter

Conflicts:
	index.html