pushing changes before pulling from master
please fucking work
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
getting rid of .DS_Store
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Trying to pull from master
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
homepage layout modifications
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Samantha