Updated .gitignore
Merge branch 'master' of https://github.com/sethbusque/pizzaccio

Conflicts:
	.gitignore
	src_custom/com/aws/global/dao/PizzaDAO.java