Added .gitignore file,git is now ignoring the Gemfile.lock file...also, I'm hungry
Merge branch 'eddwin-develop'