Merge pull request #4 from shmup/master

cleaned up the merge conflict crap
cleaned up..