front end
Merge branch 'master2' into 08-23

merging with my stuff
slight bootstrap thing