Revert "Removed merge conflict"

This reverts commit c3563c14c69415cf2e35a06bfab51028ea16f4a1.
Revert "Added bootstrap for mobile device styling (Turley, plz fix this)"

This reverts commit 30267d266db6adb916c43f143feeaeaf1bcf4812.