typo
merging
fixed small template issues due to website udpates
updates. readme etc.