Feature complete
develop add 2
Merge branch 'feature/add_2' into develop
Develop feature 3
Develop feature 3-2
Feature complete
Merge branch 'feature/3' into develop
Fix kevingyc.txt
Merge branch 'develop' of github.com:pchikoian/ICLab into develop

Conflicts:
	kevingyc.txt