Merge branch 'feature/14-factory-girl' into feature/1-remaining-specs
Merge branch 'feature/14-factory-girl' into feature/1-remaining-specs
resolved broken specs
added responsiveness
Using FactoryGirl in dashboard controller specs
Merge pull request #8 from lighthouse-labs/feature/26-neat-bourbon

added responsiveness
Merge pull request #10 from lighthouse-labs/feature/23-dashboard-factorygirl

Using FactoryGirl in dashboard controller specs
Merge branch 'feature/1-remaining-specs'

Conflicts:
	Gemfile
Merge branch 'master' of https://github.com/lighthouse-labs/selfstarter into feature/19-timeline-graph

Conflicts:
	Gemfile
	app/views/layouts/application.html.erb