Added all the stuff we did from last time
Merge pull request #1 from spendless/new-branch

Added all the stuff we did from last time