somemessage
Merge branch 'master' of github.com:noblewhale/perspective

Conflicts:
	Perspective/src/main/res/layout/activity_main.xml