2014-08-05-001-Sammi

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

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