add first in class problem
Merge branch 'inClass'

Conflicts:
	.gitignore