ignore the entire /idea folder
Merge branch 'master' of https://github.com/robertsoniv/simple
Merge pull request #4 from robertsoniv/master

panelCrunch and wellCrunch added
reverting bad merge, hopefully.
Merge branch 'master' of https://github.com/ionlyseespots/simple

Conflicts:
	app/css/app.css
	app/index.html
	app/js/controllers/SimpleCtrl.js

UGH
Merge branch 'master' of https://github.com/ionlyseespots/simple

Conflicts:
	app/css/app.css
	app/index.html
	app/js/controllers/SimpleCtrl.js

UGH
Merge branch 'master' of https://github.com/ionlyseespots/simple