fixed some of the spaces and added some stuff
Merge pull request #23 from Hot-N-Seek/cameronh

moved repetitive code to master
Merge pull request #22 from Hot-N-Seek/ivan

fixed some of the spaces and added some stuff
minor fixes