started work on lists for ko
Merge branch 'master' of https://github.com/mattfik/waf-testing

Conflicts:
	app/app.js
	app/routes/index.js
clean up merge
clean up merge
start set up for angular
basic functionality of angular working
pulling style changes
Merge branch 'master' of https://github.com/mattfik/waf-testing
Merge branch 'doAngular'

Conflicts:
	app/app.js
	app/package.json
Merge branch 'master' of https://github.com/mattfik/waf-testing

Conflicts:
	app/app.js
	app/public/javascripts/knockout/list.js
	app/views/koViews/list.jade
Angular stuff