updated index.html file
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
removed .rvmrc & Gemfile
Merge pull request #1 from ch1cana/master

pull-request-ca