added more pages and stuff
Merge remote-tracking branch 'origin/master'
'merging'