ff
Merge branch 'master' of https://github.com/TEDinTW/2014adv

Conflicts:

adv2014.xcodeproj/project.xcworkspace/xcuserdata/UI2.xcuserdatad/UserInt
erfaceState.xcuserstate