Merge pull request #2 from jaypoulz/jpCleanup

Jp cleanup
merge conflict
merge conflict
setting up android