Do not overwrite aarons changes
Merge branch 'master' of https://github.com/viscenter/jsApp