...
Merge branch 'master' of github.com:sspringer82/html5workshop

Conflicts:
	database/workshop.db
ignore database
db
Merge branch 'master' of github.com:sspringer82/html5workshop

Conflicts:
	database/workshop.db