Added create skill feature. No errors but working correctly
migrate
Fix h1 in home page
fixing style bugs
some styles
merged conflicts
Merge pull request #48 from ed-fast/dev_ed

Dev ed
styles
Merge branch 'master' into em_dev
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
things
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
Remove all the unncessary edits
Codium latest fix conflicts
testing fixes
gemfile conflict, simple rss cov