end of week 1
stuff from fri
Merge branch 'master' into blah
Merge pull request #23 from ricarora/blah

Blah