Changed git ignore file to include .DS_store files and added an automatic 3 minuite kill to the arduino
Merge branch 'master' of https://github.com/cjfman/maslab-team11-2013