Merge epicness into master

Let master be the main branch.