nothing
Merge branch 'master' of https://github.com/lwen2027/ClothesMatcher.git

Conflicts:
	Prototype/res/raw/ormlite_config.txt