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

AJAX'd