V3 T1 & T2
Merge branch 'master' of https://github.com/41407/Ratebeer