front end prototype
desktop
deleted geocoder piece of code
index page done
Update blank page
Added css colours
Minor change
Minor change
Minor addition
Search results page
Design PSD file
Added psd and screenshot jpegs
S3, permissions
Added more files
hashtags should be fixed
pulling chatroom
Merge branch 'front-end-2'
merge conflict
merge conflicts
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into chatroom