Picture on second scene
Use year in the computation
Merge pull request #17 from neicull/master

added faux geolocation for demo
Merge branch 'master' of https://github.com/guywithnose/fuzzy-octo-bear

Conflicts:
	javascript/picupload.js
Merge branch 'master' of github.com:jmate003/fuzzy-octo-bear

Conflicts:
	php-iqengines/query.php
stuff
Merge remote-tracking branch 'jmate003/master'

Conflicts:
	php-iqengines/query.php
Merge branch 'master' of github.com:guywithnose/fuzzy-octo-bear
adding logo image
Changed Initializations of text boxes
Merge remote-tracking branch 'Baysiide/master'

Conflicts:
	index.html
Fix index.html
added logo and powered by
Merge branch 'master' of github.com:guywithnose/fuzzy-octo-bear