modified:   .gitignore
	modified:   Gruntfile.js
	new file:   README.md
	modified:   app/scripts/controllers/main.js
	modified:   app/views/main.html
	modified:   package.json
Merge branch 'master' of github.com:drix/wgo
	modified:   Gruntfile.js