woo! progress
Merge branch 'master' of https://github.com/Tockz/RaffayPhoto
Merge branch 'master' of https://github.com/Tockz/RaffayPhoto