committing
Merge branch 'master' of https://github.com/wvmitchell/formslider

Conflicts:
	index.php
Merge branch 'master' of https://github.com/wvmitchell/formslider