Added main_activity1
Merge branch 'master' of https://github.com/marvinmarnold/picaplace

Conflicts:
	res/values/strings.xml
	src/com/example/picaplace/MainActivity.java
Merge branch 'master' of https://github.com/marvinmarnold/picaplace

Conflicts:
	res/values/strings.xml
	src/com/example/picaplace/MainActivity.java
another sexy