Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	assignment3/src/main/java/app/of/wonder/assignment3/MainActivity.java
	assignment3/src/main/res/values/styles.xml