hi file
Merge branch 'master' into arielle
deleted hi file
created rspec and spec file
instance attribute spec
phone formatting
Working on da db
Merge branch 'chris'