file cleanup
unraveling route changes
spec cleanup
spec cleanup
broken forms
broken form, broken functionality. but maybe some progress?
needs refactoring
Merge branch 'master' of github.com:serened/Yet-Another-Monitoring-Program into monitors
haml files getting there, need lots of controller work
experiment
nikky's experiment
intermediary solution for new monitors
monitors still in progress, issues with tests
most of CRUD is there, running into issue associating user
Merge remote-tracking branch 'upstream/master' into monitors

Conflicts:
	Gemfile.lock
	spec/controllers/dashboard_controller_spec.rb
some monitors progress. huzzah.
fixed layout
improved views and tests
test improvements
i'm calling in for back-up. params not passing to db = sad panda.