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

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

add master
tests working
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into front-end-testing

merging master
Updated runtime icon tooltip
css updates
Merge branch 'frontend' of https://github.com/bobolinks-2014/browsin into frontend

merging frontend
added click link features
added linkable media
finished runtime and top bar
added user profile page modal
user frontend
Merge pull request #54 from bobolinks-2014/controller

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

Merging master.
Merge pull request #56 from bobolinks-2014/controller

fixed users controller
merged graces changes
fixed home controller
Merge pull request #57 from bobolinks-2014/frontend

Frontend
added user profile page, moving onto ajaxing it
Merge remote-tracking branch 'origin' into frontend

mergin frontend