Premier commit.
Merge branch 'master' of https://github.com/Yureii/AdopteUnEnibien

Conflicts:
	app/css/app.css
	app/js/app.js
	app/partials/profile.html
	app/profilepic.jpg