finished all of xs work
Merge branch 'master' of https://github.com/phrayezzen/hackrice2014