First
-
fix
www
d
production
width
Merge branch 'master' of github.com:rsudekum/Data-Print

Conflicts:
	assets/css/main.css
	assets/js/main.js
	index.js
	npm-debug.log
	package.json
	templates/Activities._
	templates/Home._
merge