Merge pull request #1 from jpercent/master

Updates
Merge pull request #2 from jpercent/master

Installer update
Multitaper analysis using nitime
Added a simple code to read photodiode signals (photoDiodeSimple.m) and Dante's PTB vis_display.m code
Merge branch 'master' of github.com:NeuralProsthesisLab/unlock
Merge pull request #3 from jpercent/master

Various updates
Merge pull request #4 from jpercent/master

Configuration file changes
Merge pull request #5 from jpercent/master

Merciless Refactoring
Move the sprite to teh center of the screen
Fixes in testing
Merge pull request #6 from jpercent/master

Wired up apps
Merge branch 'master' of github.com:NeuralProsthesisLab/unlock

Conflicts:
	unlock/controller/__init__.py
Moved experiment code to a separated folder
Merge pull request #8 from jpercent/master

Documentation fixes and a new timer state
Merge pull request #9 from jpercent/master

Refactored state package factory methods into an UnlockStateFactory at t...
Merge pull request #10 from jpercent/master

UnlockViewFactory and SSVEP diagnostic fixes
Merge pull request #11 from jpercent/master

Fixes dashboard setup
Configurable flickering screen for random signal

Usage: http://localhost:5000/random?frate=<frequency in Hertz>
Example: frate=15 => Will flicker at 15Hz
No frate param in url => No flicker
Merge pull request #1 from NeuralProsthesisLab/master

merge master back into fork