Initial commit
Reorganized a few things
test
Merge pull request #1 from jessicamarshall/master

Test merge