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

updated rails
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
another rails update; rspec; about page;
seed test data on prepare
Merge pull request #4 from ryanttb/rspec

another rails update; rspec; about page;