Revert "basic"

This reverts commit e9935646a0d3802c351882ecbd54b7f823095100.
Merge branch 'master' of https://github.com/johnfonte/stredm-android

Conflicts:
	res/layout/activity_main.xml