Add coffee.txt resource
Add bye.txt resource
Merge remote-tracking branch 'remotes/origin/newlocal'
Update coffee.txt resource
Update coffee.txt resource
Update coffee.txt resource
Merge branch 'newfeat'

Conflicts:
	resources/bye.txt
	resources/coffee.txt
Merge branch 'master' of https://github.com/vincent-nittis-dev/website-test

Conflicts:
	resources/coffee.txt