Cleaned up code
Merge branch 'master' of github.com:avijohnson/general_assembly_project3

Merging changes to master for cleaned up code