Merge branch 'master' of https://github.com/selberts/ProjectEcho

Conflicts:
	Classes.js
Add to calendar

Not debuged yet because assign teams is not working
nicely formatted website
fix merge