untrack
Merge branch 'master' of ssh://git@github.com/ift6243/hera.git

Conflicts:
	gen/com/udem/ift6243/hera/R.java