quick fix
Merge branch 'browser_and_server' of https://github.com/minhtuev/Hackfest13 into browser_and_server