housekeeping
Merge pull request #6 from annajordanous/master

housekeeping