merged
Merge branch 'master' into aaron
created a db(i think) and a form for editing phone number)
Merge branch 'master' of github.com:JessicaG/slice_works_clone