temp
temp
Merge branch 'master' of github.com:6366295/ncc_week1

Conflicts:
	.idea/gradle.xml
	app/app.iml
	app/src/main/java/uva/nc/app/MainActivity.java
	lib/lib.iml
	ncc_week1.iml