Fixed timepicker, added css
Styled add activity button
More styling
Merge branch 'master' of github.com:anneback/iprog-project

Conflicts:
	Main.html