fix strict warning, edit user profile
smallfix
rm comments
fix conflict
Merge pull request #27 from mcguffin/development

Development