Merge pull request #12 from TheDizzler/Wonho

Wonho
Merge pull request #13 from TheDizzler/Wonho

Attempting to smoothly merge LoS from LoSA.
Merge pull request #14 from TheDizzler/Wonho

Wonho
Delete Controller.java
Merge pull request #15 from TheDizzler/Wonho

Wonho
Merge pull request #16 from TheDizzler/Wonho

Wonho
Merge pull request #17 from TheDizzler/Wonho

Wonho
Merge pull request #18 from TheDizzler/Wonho

Wonho
Merge pull request #19 from TheDizzler/Wonho

Wonho
Merge pull request #20 from TheDizzler/Wonho

Wonho
Merge pull request #21 from TheDizzler/Wonho

Wonho
minor changes
Merge branch 'master' of https://github.com/TheDizzler/LoS into Wonho