mergeing issues
Merge remote-tracking branch 'upstream/master' into bdtemp
testing for crp
android studio stuff
merge conflict
updated git ignore for android studio
merge conflict
merge conflict
git ignore
Merge pull request #1088 from bdonald25/bdtemp

update to gitignore to ignore android studio workspace files