Merge branch 'refs/heads/master' into bernard
added some TODOs for my future work streak
HTML & tabs clean up
Added the composer lock file
Merge pull request #12 from EricHogue/AddingComposerLockFile

Added the composer lock file
cleaning up the repo for Sylvain and any other voluntary worker
cleanup
cleanup
cleanup
cleanup part 1010230132
cleanup part 1231332
cleanup part 12334412
removing the /src/laravel folder from the configs
removing the /src/laravel folder from the configs
Merge remote-tracking branch 'refs/remotes/origin/master' into bernard

Conflicts:
	src/laravel/.gitignore
	vagrant/puppet/manifests/init.pp
added the rules that Eric added a couple days ago.
remove the /laravel path as it is no longer here
Merge pull request #15 from centraide-quebec/bernard

Ménage dans le repo
modified the file name so that the readme is loaded automatically by github's interface
small path update