basic router working
added more
resolve merge conflicts
Merge branch 'master' of https://github.com/3divs/GitGenius into magee-master

Conflicts:
	GitGenius.js