fixed branches and added some code to dev
Merge pull request #4 from wesleybowman/development

added some code to dev