added ellango as a user
changed user to ellango
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga

Conflicts:
	.classpath