prettyup
2nd
Fix layout and background
endquiz function
some stuff
 alomst done
something
Fix nav bar and login with FB
merging conflicts
merging more conflicts
Merge branch 'master' into pretty