seed file update
Merge branch 'master' of https://github.com/nizmox/demochat
gem file and database.yml update for heroku push
update gemfiles
modify database.yml
Merge branch 'master' of https://github.com/nizmox/demochat

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	deleted:    config/database.yml

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   .gitignore

Grahams-MacBook-Pro:demochat markpereira$ git add .
Grahams-MacBook-Pro:demochat markpereira$ git status
On branch master
Your branch is ahead of 'origin/master' by 4 commits.
  (use "git push" to publish your local commits)

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	modified:   .gitignore
	deleted:    config/database.yml

Grahams-MacBook-Pro:demochat markpereira$ git commit - m "modify database.yml"
error: pathspec '-' did not match any file(s) known to git.
error: pathspec 'm' did not match any file(s) known to git.
error: pathspec 'modify database.yml' did not match any file(s) known to git.
Grahams-MacBook-Pro:demochat markpereira$ git commit -m "modify database.yml"
[master 8c35198] modify database.yml
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 config/database.yml
Grahams-MacBook-Pro:demochat markpereira$ git status
On branch master
Your branch is ahead of 'origin/master' by 5 commits.
  (use "git push" to publish your local commits)

nothing to commit, working directory clean
Grahams-MacBook-Pro:demochat markpereira$ git status
On branch master
Your branch is ahead of 'origin/master' by 5 commits.
  (use "git push" to publish your local commits)

nothing to commit, working directory clean
Grahams-MacBook-Pro:demochat markpereira$ git pull origin master
remote: Counting objects: 31, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 19 (delta 12), reused 19 (delta 12)
Unpacking objects: 100% (19/19), done.
From https://github.com/nizmox/demochat
 * branch            master     -> FETCH_HEAD
   def648b..a0c178f  master     -> origin/master

Merge branch 'master' of https://github.com/nizmox/demochat
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~                                            # Lines starting with '#' will be ignored, and an empty message abort:q
:wq