rake db:migrate
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager

Conflicts:
	app/views/tasks/new.html.erb
Created username in users table.