Added links to front_page
Merge branch 'admin_bf' of https://github.com/CharlesGust/django-imagr

Conflicts:
	imagr_site/imagr_app/templates/.DS_Store
Merge branch 'master' of https://github.com/CharlesGust/django-imagr

Conflicts:
	imagr_site/imagr_app/templates/imagr_app/front_page.html