20141201

finished hero profile, weet nie wat nog om te doen nie
Merge remote-tracking branch 'origin/master'

Conflicts:
	external/appSourceFiles/DiabloProfile.R
meh
Revert "HeroLadder"

This reverts commit 6c3910b3116fe213d3bbc6716d4d53fe7dd5d586.

Conflicts:
	external/appSourceFiles/DiabloProfile.R