Creating template
Merge branch 'master' of ssh://ginc-swiftthefox.rhcloud.com/~/git/ginc

Conflicts:
	index.php