created new activities
Merge branch 'master' into cburkley
Merge branch 'master' into cburkley
fixin' up before pulling master
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager into cburkley

Conflicts:
	app/views/layouts/application.html.erb