added tests
added tests
Merge branch 'step1'

Conflicts:
	app/src/main/java/net/schoengeist/android/robolectric/MainActivity.java
	app/src/main/res/layout/activity_main.xml
	app/src/test/java/net/schoengeist/android/robolectric/MainActivityTest.java