temporary commit to merge in conflicts
Merge branch 'custom_front' of https://github.com/lab11/fast-square into custom_front
quick bugfix to get things to compile