not done
Merge branch 'master' of https://github.com/HerrBen/YRS-2014---Cyber-Duck

# By Harjot Singh
# Via Harjot Singh
* 'master' of https://github.com/HerrBen/YRS-2014---Cyber-Duck:
  Loads of backend stuff

Conflicts:
	css/main.css