Included and styled foundation progress bars

Also fixed all previous merge conflicts.