nothing to merge but lets try to merge
Merge pull request #73 from RKim220/ryan

joyride
resolve merge conlficts
Merge pull request #74 from RKim220/ajax

Ajax
fixing grid
fix grid