Adding last bits of stuff
Merge branch 'master' of https://github.com/jeremykao/LAHacks