2014-08-05-002-Sammi

2014-08-05-002-Sammi
Merge branch 'master' of https://github.com/tjsums/LC-HCM

Conflicts:
	.idea/misc.xml
	.idea/vcs.xml
	.idea/workspace.xml
Sammi test2

Sammi test2