Refactored all existing code to compile
Merge branch 'dev' of github.com:peternguyen117/butterflyEffect into dev