Yaya file
new forkit image
Just testing commit on a current record
Merge branch 'love' into byebye
This should merge the html changes in byebye with the edited images of love.
But I love you
Merge branch 'love' into byebye
Fixing conflicts
Conflicts:
	index.html
Merge branch 'byebye' into love
Merge branch 'love'
because i'm fucking arround, testing how conflicts work
Merge branch 'newlove'
seeing if newlove branch will revert the master back to the original files
goona work?
Merge branch 'newlove'
Revert "Merge branch 'newlove'"

This reverts commit dc0d3082e067bf656ace2ec14cab863d88498c23, reversing
changes made to 4c53cc1c78c27a57b0fafa19ff64cc8f7be0dc5d.
lets make a conflict
Same line change?
commit to master
commit to conflict
2 commited branches
master wins