deleting .orig file
removed .orig version of .gitignore
Working static version

Committing at this stage before I go through and clean up and organize
the code.
Updating .gitignore
Merge branch 'master' of https://github.com/sspboyd/tweetExplorerTimeLayout2

Conflicts:
	.DS_Store