gitignore .DS_Store
Merge branch 'master' of https://github.com/instantiator/front-line-tech-www