more bootstrap integration
Merge branch 'master' of https://github.com/thenderson/homework

Conflicts:
	templates/header.php
Merge branch 'master' of https://github.com/thenderson/homework
Merge branch 'master' of https://github.com/thenderson/homework
Merge branch 'master' of https://github.com/thenderson/homework
Merge branch 'master' of https://github.com/thenderson/homework
fixing file paths, permissions, etc.