updated Gemfile and library file
Merge remote-tracking branch 'origin/master'

Conflicts:
	hydronamic/lib/hydronamic.rb
Merge remote-tracking branch 'origin/master'
updated GitHub stuff and added FaceBook styles