Info in pop ups
Merge branch 'master' of https://github.com/DylanTufford/Project

Conflicts:
	build/script.min.js