iphone 3gs portrait & landscape done
Merge branch 'master' of https://github.com/nielk/nantes-nord

Conflicts:
	dist/assets/css/main.css
	src/assets/styles/main.css
landscape/portrait