commit
Merge branch 'master' of https://github.com/tuftsdev/comp20-s2014-team5

Conflicts:
	.DS_Store