..
Merge branch 'master' of github.com:windwhinny/windapp

Conflicts:
	0/app/views/layouts/default.jade
	0/public/js/build.js
Merge branch 'master' of github.com:windwhinny/windapp
Add commits