Some st00f

Sry for the errors. Deal with it. 8|
Merge branch 'master' of https://github.com/nhydock/LSAProj1