checkout test1-merge branch. (+1 squashed commit)
Squashed commits:
[e2e188a] Add a crazzzy experiment
again. (+1 squashed commit)
Squashed commits:
[8acad45] shit.
all good. (+1 squashed commit)
Squashed commits:
[c44587d] shit, master branch has gone up!
sorry (test2)
okay.

give me some! (+6 squashed commits)
Squashed commits:
[c4bca07] lets get dirty.
[c331f41] excuse but i am master. no one deletes what i write!
[48ddc6b] -shit! again... not working.....
+pardoooonnn?????????
[933242b] not working. do it again.
[94ecd30] too explicit! fix language.
[efe74bc] play.
Merge branch 'test2'

Conflicts:
	index.html