don't store the lock file
switch from bootstrap-less to bootstrap-sass
Merge branch 'master' of github.com:berkmancenter/hei

Conflicts:
	.gitignore
	Gemfile.lock
Merge pull request #3 from ryanttb/master

switch from bootstrap-less to bootstrap-sass