Added attributes
Added welcome message
Merge branch 'dev' of https://github.com/kerko/epic into dev