introduction of Brunch (+amend, update stylesheet reference to app.css)
resolve conflicts