added file upload check for file extension
upload message
resolved conflict
styling etc
Merge branch 'master' of github.com:EdwardFox/photoweb
changed description type from string to text