added bootstrap 3
Merge branch 'master' of https://github.com/mgenev/angelhackGemini2

Conflicts:
	public/css/gemini.css