misc beacon stuff
Merge branch 'master' of https://github.com/cuappdev/eatery into develop
Merge branch 'master' of https://github.com/cuappdev/eatery into develop
Merge pull request #4 from yorios9312/master

Integrating Eat Now Screen
user parse integration
Merge branch 'master' of https://github.com/cuappdev/eatery
idk
Merge branch 'master' of https://github.com/cuappdev/eatery into develop
mhm i lub dis seerup
Merge branch 'master' of https://github.com/cuappdev/eatery into develop
Parse Group creation and querying done.  See parseDataButtonPressed: and retrieveGroupsForUser: methods in NetworkingViewController.swift.  ALso refactored User.swift to make use of swift types.
Merge pull request #7 from cuappdev/develop

Develop
Merge branch 'master' into eatnow
update alamofire
Merge pull request #8 from cuappdev/eatnow

Eatnow
Eat now template
Merge pull request #9 from cuappdev/eatnow

Eat now template
Updated SignInViewController and did some other tweaks
Merge branch 'master' of https://github.com/cuappdev/eatery
alamofire updated