Update master
Update master
Update master
Update master
Update master
add userid to waiver form
Merge branch 'master' of https://github.com/damianball/ZombieSource
changing controller names, added controller routes
fixed: profile route
adding game creator
Merge branch 'controller_name' of https://github.com/damianball/ZombieSource into controller_name
Added basic tumblr blog to home
added united bootstrap layout, changed home and profile, sidebar
fixed main.php
Merged in early bootstrap changes
Merge branch 'bootstrap' of https://github.com/sachee/ZombieSource into blog
Improved tumblr loading performance
Defer tumblr load until main page loaded for performance
profile, homepage, games, fixed. games sidebar still needed. sign in still needed.
Merge branch 'bootstrap' of https://github.com/sachee/ZombieSource into blog