static pages
Merge branch 'master' of github.com:/RGaonkar/nodejsapp

Conflicts:
	package.json