changed base res
Merge branch 'master' of https://github.com/jeffreycjohnson/HatTrick