site add
Merge branch 'master' of github.com:prabintp/stateana

Conflicts:
	nodetp3/public/css/app.css

git pull
style and align