conflict test
Merge branch 'construction-for-Roy'

Conflicts:
src/com/example/insightdemo/MainActivity.java
merge conflict
Merge branch 'master' into construction-for-Roy

Conflicts:
	src/com/example/insightdemo/MainActivity.java