update
created rebasePractice branch
update 2
update
created rebasePractice branch
update 2
pulling rebasePractice because I tried to rebase pushed files... crap...

Merge branch 'rebasePractice' of https://github.com/littledannyha/testRepo into rebasePractice
update
created rebasePractice branch
update 2
Merge branch 'rebasePractice' into stashing
merging rebasePractice into stashing
rebasing is a pain
added conflict1
conflict 2