First commit!
Readme Conflict
Readme fix
Merge pull request #7 from Scrunshes/master

Set up everything before creating the awesomeness