Added content foundation from GTMob base_widget to fropWeb/ and deleted README.md as it is no longer necessary in fropWeb/.
Added gedit autosave files to .gitignore
Reverted to more general autosave regex
Merge pull request #4 from RePeet13/master

Added gedit autosave files to .gitignore
Added sample test data in json format
Added sample data for badges
Fixed non-valid json
moved test data jsons to top level
added 2 more events through duplication (for more numbers)
added field and clarified field in orgs
Merge pull request #9 from RePeet13/master

Test/Sample Data initial import
Added missing title field to event test data
Merge pull request #10 from RePeet13/master

Added missing title field to event test data
Removed fropWeb/README.txt

Merge branch 'master' of https://github.com/TheHoneybadgers/frop

Conflicts:
	fropWeb/README.txt
Added samples/ folder to fropWeb/ and included base_widget/ and comments/ to start
Moved samples/ folder from fropWeb/ to root directory
Merge pull request #11 from dgreenhalgh/master

Added content foundation from GTMob base_widget to fropWeb/
added dumps from PHPmyAdmin (of current tables)
Added db specific files, removed senseless readme
stubbed out php files that will contain methods for api