Update resources
Merge branch 'master' of https://github.com/tlinkner/web-programming-one

Conflicts:
	README.md
Update Bootstrap templates