merging data
Merge branch 'master' of https://github.com/AlphaNerds/POPS-v4-beta

Conflicts:
	index.html
	js/scripts.js