file cleanup
Merge branch 'master' of github.com:SuperAwesomeSquad/Yet-Another-Monitoring-Program
merge conflict and reset
file cleanup
Merge branch 'master' of git://github.com/serened/Yet-Another-Monitoring-Program into serened-master

Conflicts:
	app/models/base_monitor.rb
	app/models/file_monitor.rb
	config/routes.rb