Initial commit
Merge branch 'master' of github.com:devkinetics/trn-mergeconflicts
ignore MAC generated file