adding file
more changes
conflict
we created 2 new resources
Merge branch 'master' of https://github.com/pcharlem01/philip_rails_class

x;x;:XX:X:X:XXX::;x

:x
:X
:X
:x
git

git push origin master
:x
x:
help