updated with remote master
Merge branch 'master' of https://github.com/ndomar/megasoft-13
updated with remotes master
migration
seeds
Merge branch 'master' of http://github.com/ndomar/megasoft-13
update to master
added migration and edited task.rb
removed schema from commit
cleaned tmp
Merge branch 'AddNewAttributesToTask' of https://github.com/ndomar/megasoft-13 into AddNewAttributesToTask
reimplemented helper methods
tests implemented
Added Logo and Adjusted page height and footer
Merge branch 'master_PO' of http://github.com/ndomar/megasoft-13

Conflicts:
	Rails/WebsitesPrototypeBuilder/app/models/project.rb
	Rails/WebsitesPrototypeBuilder/config/routes.rb
removing tempn
fixed CSS for embedded div only
Merge pull request #275 from ndomar/fixing_master

Fixing master
merged with master again
frontend + UML +tests + doc