ignore
Merge branch 'sprint2' of https://github.com/jmccranie/Blast.git into sprint2
Merge branch 'sprint2' of https://github.com/jmccranie/Blast.git into sprint2
fixed screen scaling for older phones