Add classes
Read from file upon open
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore