no spray screens are now in order
Merge github.com:ldanielw1/cs160-mSpray

Conflicts:
	src/edu/berkeley/cs160/mSpray/NoSprayActivity.java
Merge github.com:ldanielw1/cs160-mSpray