login fix
Merge remote-tracking branch 'origin/protoBranch' into development
Den husker login
time fix
added title
fixed static links
Merge remote-tracking branch 'origin/protoBranch' into development
Merge branch 'development' of https://github.com/christianokeeffe/sw703e14 into development

Conflicts:
	js/controllers/mainController.js
Merge remote-tracking branch 'origin/protoBranch' into development
deleted git ignore
Merge remote-tracking branch 'origin/protoBranch' into development
Fixed save gamedata to adhere to new API
Merge remote-tracking branch 'origin/development' into protoBranch