Added footer to file1
Merge branch 'master' of github.com:bitmakerlabs/class1

Conflicts:
	file1.txt