Merge branch 'master' into step1-assets
Merge branch 'step1-assets' into step2-layout
Updated gitignore to hide rubymine project files
Better layout switching in application controller
Merge branch 'step2-layout' into step3-view

Conflicts:
	app/controllers/application_controller.rb