add semester to front page
copyright right position
merge conflicts