Creating dev
Merge branch 'master' into dev
Stable version
Make this work with hosting. could not run php in html file
Prevent css caching
Adding makefile
Test deploy
Test deploy
Fix makefile
Makefile fix
Bootstrap call-me-back
Call me back button
Merge branch 'stable'

Conflicts:
	web/index.php
	web/page/head.html
	web/page/header.html