Added Sinatra and Haml
Merge branch 'add_sinatra'

Conflicts:
	Gemfile
	Gemfile.lock