adjusted json file name
login basic error checking
merge with master
Merge branch 'css' with 'master'