first development commit
fixed merge conflicts
added block headers to user profile
removed :s form profile