Add requirejs to node package.json
Merge branch 'master' of github.com:dounan/contacts

Conflicts:
	package.json
First commit of Ember app...still setting it up.