Added pony gem.
Added email controller.
Emailing sucks.
Why won't pry woooork.
Derp
Merge branch 'master' of github.com:heathered/task-project into heather
Added email functionality
Renamed submit button
task index page css
work in progress
work in progress
Merge branch 'master' of github.com:heathered/task-project
Merge branch 'master' of github.com:heathered/Task-Project

Conflicts:
	app/views/tasks/edit.html.erb
	app/views/tasks/index.html.erb
	app/views/tasks/show.html.erb
Merge branch 'master' of github.com:heathered/task-project into heather

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/global.css
Missed merge
Bug fixing.
fix bugs and other small
Merge branch 'master' of github.com:heathered/Task-Project into jason
Added basic navigation.
Merge branch 'master' of github.com:heathered/Task-Project into jason