Styling
Minor styling
adding jsonp
resolved conflicts
install link]
Merge branch 'master' of github.com:thanpolas/gitfox