- update code
update code
update
Removed file that shouldn't be tracked
update
Merge branch 'master' of https://github.com/VanancyLuu/OakClub

Conflicts:

OakClub.xcodeproj/project.xcworkspace/xcuserdata/vanluu.xcuserdatad/User
InterfaceState.xcuserstate