Six pack changes + Beer#25

mkanke-real wants to merge 1 commit intofunky-station:masterfunky-station/forky-station:masterfrom

mkanke-real:Sixpack-Changesmkanke-real/forky-station:Sixpack-ChangesCopy head branch name to clipboard