update
Merge branch 'master' of https://github.com/scottbolten/nwen304-2014-lab2

Conflicts:
	package.json