merging
Merge branch 'frontAPI' of https://github.com/dcelik/MobileProtoFall2014-LoCo into frontAPI
Merged conflicts
Merge branch 'frontAPI' of https://github.com/dcelik/MobileProtoFall2014-LoCo into frontAPI
Merge branch 'frontAPI' of https://github.com/dcelik/MobileProtoFall2014-LoCo into frontAPI
Editing signup page for phone input