second updated commit
Merge branch 'master' of https://github.com/splinter-seven/concordia

Conflicts:
	scripts.js
	scripts.js~