CSS changes
Merge branch 'develop' into resumes-ui-integration
Sidebar and Glyphs
Homepage
Merge pull request #17 from keanulee/homepage

Homepage
View changes
Merge pull request #18 from keanulee/resumes-ui-integration

Resumes ui integration
Merge branch 'develop' into feature-home-page

Conflicts:
	app/views/main/index.html.erb