update gitignore for jekyll

added gemfile*
add _site to gitignore
commit to master
added blinkvoltage
resolve conflict in README.md

not sure what thec conflict is/was
Merge remote-tracking branch 'origin/gh-pages'

	README.md
remove garbage from README.md
remove formatting characters from script
remove formatting characters from script
remove formatting characters from script
remove formatting characters from script
remove formatting characters from script
remove formatting characters from script
remove formatting characters from script
remove formatting characters from script
remove formatting characters from script
remove formatting characters from script
remove formatting characters from script
Merge remote-tracking branch 'origin/gh-pages' into gh-pages