Merge branch 'master' of http://github.com/AdrianDeVera/612-2014
Merge branch 'master' of http://github.com/Chantilly612Code/612-2014
updated .gitignore
Merge branch 'master' of http://github.com/Chantilly612Code/612-2014

Conflicts:
	.gitignore
Merge pull request #38 from ZackAlfakir/master

.gitignore