Merge branch 'master' of https://github.com/Mirv/my-RailsMN

Conflicts:
	.DS_Store
	config/.DS_Store
Lesson 3 - Part 3
Lesson 3 - Part 3 - Attempt 5
Delete this shit!!!
Testing Conflicts #9