11
Merge branch 'master' of https://github.com/yigosan/FirstAndroid.git

Conflicts:
	FirstProject/res/layout/activity_main.xml
Added extra button
Added Toggle Button