r changes
Merge branch 'for-the-win' of https://github.com/VirtuoC/Classrooms into for-the-win

Conflicts:
	.gitignore