commit before pull
final commit before sprint 3, updated views/layouts/misc