Merge pull request #9 from joverall22/master

Cohort work
idk
omg
omg
merged
omfg
Merge pull request #11 from eanplatter/master

Style updates