3 commits

Author	SHA1	Message	Date
David Baldwynn	45db8ab5bd	Update app.json	2015-11-21 12:59:03 -08:00
David Baldwynn	96ea74852e	fixed merge conflicts	2015-11-16 14:25:39 -08:00
David Baldwynn	7eccc07d02	added heroku one-click deploy button	2015-11-12 17:00:18 -08:00