added documentation, various bug fixes
fixed merge conflict
Merge branch 'master' of https://github.com/virajparikh/Beer-League

"pulled in upstream changes before pushing commits"