update to merge
resolve merge conflicts
Merge pull request #45 from RKim220/ajax

update to merge