semicolons
semicolons
Merge branch 'master' of https://github.com/MTM616/Lecturn
Merge branch 'master' of https://github.com/MTM616/Lecturn
changing to post

Conflicts:
	static/main.js