Delete README.md
Merge pull request #4 from yunixon/dev

Dev
Merge branch 'dev'
fix
Merge branch 'master' of github.com:yunixon/omikron
Merge pull request #6 from yunixon/dev

readme some change 2
Merge pull request #14 from yunixon/dev

Dev
Merge pull request #35 from yunixon/dev

#HomeTask#3
Merge pull request #58 from yunixon/dev

Dev to master
delete factory girls from seeds
Error in show event
After merging
Repair merge issue