Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei
change telephoto icon
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei
Change photo algorithms
Merge pull request #92 from leituo56/Dev_TuoLei

Dev tuo lei
Hot fix, portrait < 4 instead of <=4
Hot fix, portrait < 4 instead of <=4
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei
Merge pull request #93 from leituo56/Dev_TuoLei

Dev tuo lei