functional
Update README.md
Fix merge conflict.
Update readme
Merge branch 'master' of github.com:krauzer/fist_of_five_group_project into molly
Commit before merge.
Fix merge conflicts.
Merge pull request #22 from krauzer/cassie

Cassie
Merge branch 'master' of github.com:krauzer/fist_of_five_group_project into molly

pull changes from master
add location attribute to ticket, add to ticket creation process