Vestibule Week 2 Day 2(7) - small changes to cookie-clicker activity

gistfile1.txt

Last login: Tue Nov 21 16:23:39 on ttys001
GAs-MacBook-Air:~ ga$ cd ga-wdi/fundamentals/cookie_clicker_lab/cookie_clicker/
GAs-MacBook-Air:cookie_clicker ga$ git status
On branch master
Your branch is up to date with 'origin/master'.

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:   css/style.css
	modified:   index.html

no changes added to commit (use "git add" and/or "git commit -a")
GAs-MacBook-Air:cookie_clicker ga$ git add .
GAs-MacBook-Air:cookie_clicker ga$ git commit -m "added description for point values of each cookie, and styles."
[master 7c39df1] added description for point values of each cookie, and styles.
 2 files changed, 27 insertions(+), 2 deletions(-)
GAs-MacBook-Air:cookie_clicker ga$ git push
Counting objects: 5, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (5/5), 732 bytes | 366.00 KiB/s, done.
Total 5 (delta 3), reused 0 (delta 0)
remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git
   9d16df8..7c39df1  master -> master
GAs-MacBook-Air:cookie_clicker ga$ git branch
  hammad-malik-lab-mvp
  hammad-malik-lab-submission
* master
GAs-MacBook-Air:cookie_clicker ga$ git checkout hammad-malik-lab-submission
Switched to branch 'hammad-malik-lab-submission'
Your branch is up to date with 'origin/hammad-malik-lab-submission'.
GAs-MacBook-Air:cookie_clicker ga$ git merge master
Updating 9d16df8..7c39df1
Fast-forward
 css/style.css | 24 +++++++++++++++++++++++-
 index.html    |  5 ++++-
 2 files changed, 27 insertions(+), 2 deletions(-)
GAs-MacBook-Air:cookie_clicker ga$ git push
Total 0 (delta 0), reused 0 (delta 0)
To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git
   9d16df8..7c39df1  hammad-malik-lab-submission -> hammad-malik-lab-submission
GAs-MacBook-Air:cookie_clicker ga$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
GAs-MacBook-Air:cookie_clicker ga$ git checkout hammad-malik-lab-mvp
Switched to branch 'hammad-malik-lab-mvp'
Your branch is up to date with 'origin/hammad-malik-lab-mvp'.
GAs-MacBook-Air:cookie_clicker ga$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
GAs-MacBook-Air:cookie_clicker ga$ git status
On branch master
Your branch is up to date with 'origin/master'.

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:   css/style.css
	modified:   index.html

no changes added to commit (use "git add" and/or "git commit -a")
GAs-MacBook-Air:cookie_clicker ga$ git add .
GAs-MacBook-Air:cookie_clicker ga$ git status
On branch master
Your branch is up to date with 'origin/master'.

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

	modified:   css/style.css
	modified:   index.html

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:   index.html

GAs-MacBook-Air:cookie_clicker ga$ git add .
GAs-MacBook-Air:cookie_clicker ga$ git commit -m "changed markup to reuse class to style score font, instead of adding the rule to the existing class. More consistent that way. And I looked a little closer, and it turns out the cookie IS a png, with opacity no less. So I added a somewhat transparent background-color to the .animate-cookie class, looks even better now if I do say so myself."
[master 30aa25a] changed markup to reuse class to style score font, instead of adding the rule to the existing class. More consistent that way. And I looked a little closer, and it turns out the cookie IS a png, with opacity no less. So I added a somewhat transparent background-color to the .animate-cookie class, looks even better now if I do say so myself.
 2 files changed, 3 insertions(+), 2 deletions(-)
GAs-MacBook-Air:cookie_clicker ga$ git push
Counting objects: 5, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (5/5), 672 bytes | 672.00 KiB/s, done.
Total 5 (delta 3), reused 0 (delta 0)
remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git
   7c39df1..30aa25a  master -> master
GAs-MacBook-Air:cookie_clicker ga$ git checkout hammad-malik-lab-submission
Switched to branch 'hammad-malik-lab-submission'
Your branch is up to date with 'origin/hammad-malik-lab-submission'.
GAs-MacBook-Air:cookie_clicker ga$ git merge master
Updating 7c39df1..30aa25a
Fast-forward
 css/style.css | 3 ++-
 index.html    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
GAs-MacBook-Air:cookie_clicker ga$ git push
Total 0 (delta 0), reused 0 (delta 0)
To https://git.generalassemb.ly/tomatohammado/cookie_clicker.git
   7c39df1..30aa25a  hammad-malik-lab-submission -> hammad-malik-lab-submission
GAs-MacBook-Air:cookie_clicker ga$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
GAs-MacBook-Air:cookie_clicker ga$