successfully merged with dev-lou
update to remove lou from bullshit-code
Fixed some stupid typos and what not
merged all branches and fixeded a typo
merged dev-lou with master