finished transition
Merge branch 'development' of https://github.com/jackyujieyang/Hacknection into development