more styling on timeline
resolve merge conflicts
Merge pull request #65 from RKim220/ajax

Ajax