Un-revert changes
Merge branch 'master' of https://github.com/mvalenta/ClassPlanner

Conflicts:
	.gitignore