reverting back to Sean's small color changes commit, god im bad with github, sorry guys
reverting back to Sean's small color changes commit, god im bad with github, sorry guys
added some too
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Committer: warnermc <maxwellwarner@Maxwells-MacBook-Pro.local>
#
# HEAD detached at e3b9cc3
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   db/schema.rb
#
commiting my changes?
Merge remote-tracking branch 'origin/temp'

reverts commit d9470276784f6c17d53751b3ee551896da249f73.

Conflicts:
	.gitignore