renamed my gem's css file to reflect the name of my gem and not the rails convention I stole it from!
Create gh-pages branch via GitHub
Merge branch 'gh-pages' of github.com:PatientKeeper/cuke_parser into develop
updated gitignore file
Merge branch 'gh-pages' into develop

Conflicts:
	.gitignore
removing stuff I mistakenly merged into develop
updated gitignore
updated gemspec to reflect minor version change, updated cuke_parser.rb to take a name for the json file if you want, use the new method json_custom. Jenkins doesn't support this yet as the change would be more intrusive + the folder location of the files makes this pretty unique to begin with (probably won't need it). updated json_parser to support new workflow