must have done stuff here first
looks like I have to do this

Merge branch 'master' of https://github.com/diceguyd30/dice-site

Conflicts:
	DiceCatalog/deploy
Merge branch 'master' of https://github.com/diceguyd30/dice-site
Merge branch 'master' of https://github.com/diceguyd30/dice-site
Merge branch 'master' of https://github.com/diceguyd30/dice-site
cleaning up the server side scripts