gitignore edits
don't store the lock file
switch from bootstrap-less to bootstrap-sass
update rails
Merge pull request #2 from apatel/master

updated rails
Merge branch 'master' of github.com:berkmancenter/hei

Conflicts:
	.gitignore
	Gemfile.lock