Update for bootstrap 3, add missing stuff
Merge branch 'master' of github.com:espenfjo/FjoSpidie-Interface

Conflicts:
	README.md