Added stuff and updated README
Final commit
merge