Test commit.
Testing commit for multiple files.
Add newline to end of files for Linux compatibility.
Merge pull request #2 from DevinGonzalez/master

Testing GIT lifecycle.
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