I should learn how to stash. Need working stuff from branch.
Merge branch 'master' of github.com:WheezePuppet/poorHouse

Conflicts:
	unlimitedWants/shiny/server.R
Committing changes to shiny and reversions to working version