Changed the format of the main
Merge branch 'master' of https://github.com/feidian509/moviejournal
Redid some more things in main