Upgraded JetBrains Rubymine IDE which added a .idea folder.  Also upgraded Ruby to V2.0 which required changes in the gemfile for the mysql2 version
Updated .gitignore for .idea subfolder and added a few images
Merge branch 'master' of https://github.com/lendon1/Heather_Gates

Conflicts:
	.idea/.rakeTasks
	.idea/Heather_Gates.iml
	.idea/dataSources.xml
	.idea/workspace.xml