adding stuff
adding shit
fuck
stuff
Merge branch 'master' of https://github.com/LAHacks/lahacks-site

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Signed-off-by: Brandon Foo <takkun00@gmail.com>
Merge branch 'master' of https://github.com/LAHacks/lahacks-site
added direct tv and pop chips