2013-09-21
Before first merge 2013-09-23
just after first merge
fixing conflict index.php and main.php
Done with entry_model.php
delete readme.txt and models/entry.php"
2013-09-24 fixing confict in main.php and index.php