Merge pull request #57 from bobolinks-2014/frontend

Frontend
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into frontend

merged master.
user fixes