Fixed (all?) bugs
Merge branch 'master' of github.com:Logicon211/LAMER