I like tacos.
I like rice.
renamed a file
removed rogue file, added wolverine. Made sure to add it this time.
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from karlmortensen/master

some changes