test
Merge branch 'master' of https://github.com/Contraroe/Bureau-Maurice

Conflicts:

__compass/.sass-cache/4cfa8d8ffd2648a20c85bb177b9d9adbc11092cc/_content.
sassc

__compass/.sass-cache/4cfa8d8ffd2648a20c85bb177b9d9adbc11092cc/_footer.s
assc

__compass/.sass-cache/4cfa8d8ffd2648a20c85bb177b9d9adbc11092cc/_header.s
assc

__compass/.sass-cache/4cfa8d8ffd2648a20c85bb177b9d9adbc11092cc/_mixins.s
assc

__compass/.sass-cache/4cfa8d8ffd2648a20c85bb177b9d9adbc11092cc/_searchba
r.sassc

__compass/.sass-cache/4cfa8d8ffd2648a20c85bb177b9d9adbc11092cc/_variable
s.sassc

__compass/.sass-cache/4cfa8d8ffd2648a20c85bb177b9d9adbc11092cc/global.sa
ssc

__compass/.sass-cache/4cfa8d8ffd2648a20c85bb177b9d9adbc11092cc/style.scs
sc