Cleaned up Code
Merge branch 'master' of https://github.com/jbentley10/projectwarp