need to save metrics to db
Merge branch 'master' into savemetrics
save state
fixed merge
added stats and xp
merge conflict fixed. maybe.
Merge branch 'master' into savemetrics
Merge pull request #99 from red-admirals-2014/savemetrics

Savemetrics