update
merge json file
merge
remove alert test
add home page
update
fixed css
Merge branch 'master' of heroku.com:thawing-waters-8314