niets bijzonder
Merge branch 'master' of https://github.com/GreenSpider/Google

Conflicts:
	Hello_Name/.idea/workspace.xml
	Hello_Name/src/com/example/Hello_Name/HelloNameActivity.java