Merge branch 'master' of https://github.com/monadnockMedia/lifeAboard

Conflicts:
.gitignore