+ stuff to gitignore
Merge branch 'master' of github.com:marcosalles/eps-2013

Conflicts:
	.gitignore