basic version
committing merge

Conflicts:
	app/src/common/js/app.js
	app/src/config/buildfilesModules.json
fixed my merge errors
working version of the challenge tracker, but references test data as fillers.

Conflicts:
	app/src/config/buildfilesModules.json
fixed a quick bug.
added one more goal for example
Merge branch 'master' of github.com:sigepberkeley/calsigep.com