Added create skill feature. No errors but working correctly
migrate
Fix h1 in home page
fixing style bugs
some styles
Merge pull request #47 from sammyjopeters/master

Fixed bug on edit form, disabled caching for dev environment
merged conflicts
Merge pull request #48 from ed-fast/dev_ed

Dev ed
fix student image issue
Merge branch 'master' into alberto

Conflicts:
	app/assets/stylesheets/pages.css.scss
	db/schema.rb
Merge pull request #49 from albertodotcom/alberto

Fix h1 and students images
Migrate db
Merge branch 'create_skill_feature' of https://github.com/ltfschoen/codium into ltfschoen-create_skill_feature

Conflicts:
	app/models/user.rb
	db/schema.rb
Merge pull request #50 from albertodotcom/master

Merge Luke changes
students' profile pages
Merge branch 'profiles' of https://github.com/lukru/codium into lukru-profiles

Conflicts:
	app/helpers/application_helper.rb
Merge pull request #53 from albertodotcom/master

Merge Lauren changes