ignore .idea files
Merge branch 'master' of https://github.com/psichel/learn-rails

Conflicts:
	.idea/learn-rails.iml
	.idea/workspace.xml