initialize
Merge branch 'master' of https://github.com/thilinah/ice-framework.git

Conflicts:
	LICENSE