makes default button size flexible
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector into kevin2
merges style fixes
Merge branch 'master' into work

Merging in Wednesday night updates to chart etc
Merge branch 'master' into work

merging Wed night differences, deleting tests
adds .env file, env gem, adds .env to gitignore
some changes
remove files not in use to get ready for deployment
chart changes
Merge pull request #58 from cameronjacoby/master

remove files not in use to get ready for deployment
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector

merging pull request 58?
changes for heroku, rails12factor gem
standardizes button style
Merge pull request #59 from lisavogtsf/master

preparing for Heroku deployment
precompiling assets
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector into kevin2
stuff
update scheduler.rake file
Merge pull request #60 from lisavogtsf/master

problematic db schema, but bringing local up to heroku
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector