Update CompanyProfiles/Company.html
Sorry for the late commit.

Still having some trouble with github.
Sorry for the late submission
Updated company
Merge pull request #61 from ndomar/C3_Maya_CreatesHTML

Sorry for the late submission
Merge pull request #60 from ndomar/C2_Basem_CreatesHTML

My profile.
ignoring DS_Store for mac user
Nevermind, this commit, and the mac user one
Updated the encrypted HTML task files
Merge pull request #62 from ndomar/C4_george_createsHTML

Updated the encrypted HTML task files
Rails task Initial Commit
Added User, Register page, Home page
Adding Blogposts
Update a blogpost
delee blogpst
Fixed register for User, was missing migrate:db
Login
Login 2
Merge branch 'C4_Soliman_Rails_initial_commit' of https://github.com/ndomar/megasoft-13 into C4_Samy_Rails-taskS6

Conflicts:
	Rails/blog/config/routes.rb
	Rails/blog/db/schema.rb
add comment