Cleaned up the code so it is all pretty like
Lagging file picked up
Fixed mergew errors, appeased the hound
Fixed merge
Merge pull request #28 from LaunchAcademy/code_cleanup

Cleaned up the code so it is all pretty like