Empty
Merge branch 'addc3' of https://github.com/laststraw/bootstrap_template into addc3