Merge pull request #2 from AUTinker/usamap

change js layout
added graph
Merge branch 'master' into songgao/trend
Merge pull request #3 from AUTinker/usamap

add usamap.js and states data
Merge branch 'master' of github.com:AUTinker/tinker into songgao/trend
renamed trend to Trend to avoid conflict with function trend()
width/height for trend
data reading and insert to database
add pills in trends
Merge pull request #5 from AUTinker/usamap

static usamap
Merge branch 'master' into songgao/trend

Conflicts:
	assets/css/app.css
mergin and add states and counties