pre merge
pre merge
merge
Merge branch 'master' of github.com:DeRain/hackaton
fix after merge