fixed the lucas
Merge branch 'master' of https://github.com/addtheletters/2013-PhillyThon

Conflicts:
	src/atl/phillython/MainActivity.java