Merge branch 'Clean_up'
Merge branch 'Clean_up'
Merge branch 'master' of https://github.com/natedunn/Flint