file cleanup
Merge branch 'master' of github.com:SuperAwesomeSquad/Yet-Another-Monitoring-Program
merge conflict and reset
file cleanup
fixing static pages
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
static page content
Add devise controller spec helper
Add initial alerts controller support
Merge pull request #23 from serened/static_pages

Static pages
Merge pull request #24 from allynfolksjr/devise_controller_test_fix_and_alerts

Devise controller test fix and alerts
corrected routes and dashboard controller test