Note
Main Activity is being super dumb
Nothing is changing
Really dumb
Merge branch 'master' of https://github.com/n8frog/DangerOverheadPowerLines

Conflicts:
	DOP/src/com/example/dop/MainActivity.java