first commit
Merge branch 'master' into lories-branch
Cautionary commit with app.css changes
Merge branch 'emi-branch' into lories-branch

Conflicts:
	app/css/app.css
	app/img/page_01_overlay.jpg
	app/img/page_01_pic1.jpg
	app/img/page_01_pic2.jpg
	app/img/page_01_pic3.jpg
	app/img/page_01_pic4.jpg
	app/img/page_01_swirl.png
	app/img/page_02_circle.png
	app/img/page_02_overlay.jpg
	app/img/page_02_pic1.jpg
	app/img/page_02_pic2.jpg
	app/img/page_02_pic3.jpg
	app/img/page_03_arrow.png
	app/img/page_03_overlay.jpg
	app/img/page_03_play.png
	app/img/page_03_thumb.jpg
	app/img/page_04_arrow.png
	app/img/page_04_overlay.jpg
	app/img/page_04_thumb.jpg
	app/img/page_05_circle.png
	app/img/page_05_overlay.jpg
	app/img/page_05_slot_bridge.png
	app/img/page_05_slot_games.png
	app/img/page_05_slot_lang.png
	app/img/page_05_thumb.jpg
	app/img/page_06_hero.png
	app/img/page_06_overlay.jpg
	app/img/page_06_thumb.jpg
	app/img/page_07_overlay.jpg
	app/img/page_07_pic1.jpg
	app/img/page_07_pic2.jpg
	app/img/page_07_pic3.jpg
	app/img/page_07_splat1.png
	app/img/page_07_splat2.png
	app/img/page_07_splat3.png
	app/img/page_07_splat4.png
	app/img/page_07_thumb.jpg
	app/img/page_08_arrow.png
	app/img/page_08_overlay.jpg
	app/img/page_08_overlay2.jpg
	app/img/page_08_pic1.jpg
	app/img/page_08_pic2.jpg
	app/img/page_08_thumb.jpg
	app/img/page_09_overlay.jpg
	app/img/page_09_roses.png
	app/img/page_09_thumb.jpg
	app/img/page_10_arrow.png
	app/img/page_10_overlay.jpg
	app/img/page_10_thumb.jpg
	app/img/page_11_arrow.png
	app/img/page_11_icon.png
	app/img/page_11_overlay.jpg
	app/img/page_11_pic1.jpg
	app/img/page_11_pic2.jpg
	app/img/page_11_pic3.jpg
	app/img/page_11_thumb.jpg
	app/img/page_12_arrow.png
	app/img/page_12_filmstrip.png
	app/img/page_12_overlay.jpg
	app/img/page_12_pic1.jpg
	app/img/page_12_pic2.jpg
	app/img/page_12_pic3.jpg
	app/img/page_12_pic4.jpg
	app/img/page_13_arrow.png
	app/img/page_13_overlay.jpg
	app/img/page_13_thumb.jpg
	app/img/page_13_video.jpg
	app/img/page_14_button.png
	app/img/page_14_logo.png
	app/img/page_14_overlay.jpg
	app/img/page_14_swirl.png
	app/img/page_14_thumb.jpg
	app/js/app.js
	app/json/magazine.json
	app/partials/page1.html
	app/partials/page10.html
	app/partials/page11.html
	app/partials/page12.html
	app/partials/page13.html
	app/partials/page14.html
	app/partials/page2.html
	app/partials/page3.html
	app/partials/page4.html
	app/partials/page5.html
	app/partials/page6.html
	app/partials/page7.html
	app/partials/page8.html
	app/partials/page9.html
	app/scss/_views.scss
	app/scss/app.scss
Integrating Emi's work.

Everything seems to be working except for the video, though the
components are there
Committing dumb app.css again

due to warnings
Merge branch 'lories-branch'