ready for mer
resolve merge conflicts
Merge pull request #61 from RKim220/ajax

Ajax