Added first test for the new ascent field
Merge branch 'master' of github.com:justinhennessy/dm-challenge

Conflicts:
	spec/features/create_activities_spec.rb