Merge branch 'master' into benhalverson-master
Changed Bootstrap theme
Added background color
added wells and fixed typos
Merge branch 'master' into benhalverson-master
added total to order history
Merge branch 'benhalverson-master'
merge