add skills and competencies
Merge branch 'master' of github.com:hatoishi/squad
Add Projects and requirements
Green test suite
add four users to seed
Merge branch 'master' of github.com:hatoishi/squad
Add homepage.
Homepage to either log in or dashboard.
Merge branch 'front-end-shit' of github.com:hatoishi/squad into front-end-shit

Conflicts:
	app/controllers/home_controller.rb
	app/views/home/index.html.erb