updated and merged with drew
Merge remote-tracking branch 'josh/master'
working on contact info view
Merge remote-tracking branch 'Drew/master'
Merge remote-tracking branch 'Drew/master'
Commit
Merge remote-tracking branch 'josh/master'
edited and added contact info things
Merge remote-tracking branch 'Alana/master'