did some stuff
Merge branch 'master' of github.com:dpeticol/peticol.as

Conflicts:
	.gitignore