small change to router file
Merge branch 'master' of https://github.com/deanwenick/nfz
added feelings model and view
needs model, view and router working
choices model and view working
request view working
working on removing views on update. Older views are still reacting to events
got views to update global object correctly, still not reading form db
adding list of prepared feelings
Merge branch 'master' of https://github.com/deanwenick/nfz
Merge branch 'dean'

Conflicts:
	app.js
	index.html
	package.json
	public/card.js
	public/js.js