udpate 6/12
Merge branch 'master' of https://github.com/BowlMinions/SEK-Admision2014