added try catch data for json parsing
whitespace changes
Merge branch 'master' of github.com:geirjohankent/app