added proposals, bower file
added gitignore file
Added html and css files for the website template
added 2 json test files
Merge branch 'feature-json_mock_files' into develop

Added 2 json mock files
Created a script to pull in data from fake JSON file to test out format
fixed issues with json formatting, parsing, and some styling.
Merge branch 'hotfix-json_comments' into site_JSON
Merge branch 'site_JSON' into develop
Edited CSS to make User details float left
Added a Google Maps map into the user's page currently focused on RIT
Added geolocation requests to pinpoint a user's location by latitude and longitude
started facebook API integration
fixed some scope issues, factored out some functions
Merge branch 'feature-FB_api' into develop
Merge branch 'feature-geocache' into develop

(Hopefully fixed) Conflicts:
	scripts/mainscript.js
fixed removal of map thingy
also moved button up
Merge branch 'fix-merge' into develop
Merge pull request #6 from KevinMGranger/develop

Prototype Stage