First commit
Merge branch 'android' of https://github.com/pratheekms/brainwaves_teamninja into android