Added name
Merge branch 'master' of https://github.com/ncss-2014-group-3/group3-demo

Conflicts:
	README.md