text in
name
Merge branch 'text-trials'

Conflicts:
	1st-assignment/img/bra.png
	1st-assignment/img/crying.png
	1st-assignment/img/embarrased.png
	1st-assignment/img/headtilt.png
	1st-assignment/img/heart.png
	1st-assignment/img/hi.png
	1st-assignment/img/idea.png
	1st-assignment/img/jump.png
	1st-assignment/img/kiss.png
	1st-assignment/img/ooh.png
	1st-assignment/img/run.png
	1st-assignment/img/shy.png
	1st-assignment/img/smile.png
	1st-assignment/img/star.png
	1st-assignment/img/tounge.png
	1st-assignment/img/unhappy.png
	1st-assignment/img/upsidedown.png
	1st-assignment/img/wink.png