repo cleanup

messed up on the last commit
Merge pull request #10 from glennlopez/development

master cleanup