First commit

Changed readme.md
Merge branch 'master' of https://github.com/jimmybisenius/pchswebmaster2014-15

Conflicts:
	README.md