brief changes
Merge branch 'master' of github.com:wvmitchell/formslider

Conflicts:
	index.php