initilising
Merge branch 'master' of github.com:ollytheninja/lab3

Conflicts:
	.gitignore
	README.md