changed intro.js settings
Merge branch 'master' of https://github.com/ilia-kats/NRPSDesigner
Merge branch 'master' of https://github.com/ilia-kats/NRPSDesigner

Conflicts:
	Django/DjangoNrps/templates/base.html
I'm just trying to merge my shit with the master
Merge branch 'master' of https://github.com/ilia-kats/NRPSDesigner

Conflicts:
	Django/DjangoNrps/templates/home.html
removed fb and twitter from base.html and added new nrps designer logo