Change in template + adding a few useful macros
Merge branch 'master' of https://github.com/alexAubin/beamerTemplate

Conflicts:
	template/Makefile