renamed
testing
wip
whoops.
Merge pull request #11 from yorthehunter/rename

Rename
name
merger master and fix conflicts