switched to bootstrap 3.0
Merge branch 'master' of https://github.com/tobiasweise/tobiasweise.github.io

Conflicts:
	index.html