messing around
merge conflict changes
stated stats page
Merge pull request #8 from elof/master

stats page