Merge pull request #58 from Mchapuis/master

Hurr hurr menus hurr
Merge pull request #59 from Mchapuis/master

pull upl
Merge pull request #60 from Mchapuis/master

Get some stuf
Merge pull request #61 from Mchapuis/master

fgds
finishing touches (haha not really)

Signed-off-by: Travis Henry Martin <travis.h.martin@gmail.com>
Merge pull request #45 from mysteriosum/master

gfsd