Merge pull request #10 from Lastbastian/chris3

updates
i think we can ignore this commit
fix merge conflicts
AJAX FOR WHAT
Merge pull request #11 from Lastbastian/wesley

AJAX'd
Merge pull request #12 from Lastbastian/chris3

results
updates