comm
Merge branch 'master' of https://github.com/IndependentStudy14-15/karem

Conflicts:
	README.md
Merge branch 'master' of https://github.com/IndependentStudy14-15/karem