added tons of stuff
Merge pull request #5 from rolz/master

added tons of stuff