erb convert to haml
update Gemfile.lock
use Puma
Remove comments in 'Gemfile
Merge branch 'master' of github.com:sachin21/uploader