Added collection interfaces and working on inner classes.
Commited some local conflicts.
Merge with master.  Fixed conflict with Study List.md

Conflicts:
	notes/Study List.md