Fly one
Merge branch 'master' of github.com:ssewardSolstice/Smart-Office-Android-Assets

Conflicts:
	drawable-xhdpi/Screen Shot 2014-04-10 at 10.34.00 PM.png