Modification du compte lié à Pierre-Lin Bonnemaison (about.md)
Annuler test
Commit test annuler
Merge remote-tracking branch 'origin/master'

Conflicts:
	ABOUT.md

Syncro du fork avec le projet maitre.
Merge branch 'master' of https://github.com/digisquare/digisquare.git

Conflicts:
	ABOUT.md
migrations ok
schema.php ok
fichier conf startups
Ajout prenom alexandre
Creation_migration_Tags
Ajout du model Startup
Ajout du controller Startups
Commit Create_migration_tags
create_table_events_tags
create_table_events_tags
create_table_events_tags
create_table_events_tags
create_table_events_tags
create_table_events_tags
Merge branch 'master' of https://github.com/davydoe/digisquare

Conflicts:
	app/Config/Migration/1390328133_migration_event_tags.php