Promotion
Merge branch 'master' of https://github.com/younes-barhouni/IntraUniversity

Conflicts:
	wp-content/themes/twentythirteen/functions.php