removed.idea from tracking
Merge branch 'switchToMoment'
fixed typo
merge to master