Repo merge, plus added the front end and Jorbin as contributor