Added heroku_san, installed rspec
Added triggers scaffold
Merge pull request #2 from PrototypeAlex/feature-triggers

Feature Triggers
Merge branch 'master' of github.com:grahamjenson/papergame into awards
Added lots of generated and random stuff
Added lots of generated and random stuff
Merge branch 'master' of github.com:grahamjenson/papergame into awards
added users to factories, devise to spec_helper, faker, still need to make awards_controller_spec passing
finally, it's passing, now move on to get the push stuffs
added award templates
work with ok params, still don't know which params are being passed into from the API