ok
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager

Conflicts:
	app/models/task.rb
	app/models/user.rb
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager
got rid of session in layout