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

Conflicts:
	app/app.iml
	app/src/main/java/uva/nc/app/MainActivity.java
Merge branch 'master' of github.com:6366295/ncc_week1