Add a text in this file this fixes #15
Merge branch 'master' of https://github.com/chrisrosana/ccsf-1.github.io into chrisrosana-master

Conflicts:
	LICENSE.txt
Merge branch 'chrisrosana-master'