-n 
Add dist directory
-n 
Go to Heroku 2nd attempt
Merge branch 'master' of heroku.com:mari-pokedex

Conflicts:
	package.json
	server.js
	views/about.html
	views/pokedexMain.html