Inté punching
Merge branch 'master' of https://github.com/emoc11/P2016-E05-PHP

Conflicts:
	app/Views/punching.html
	config/config.ini