hello
Changing colors again
Merge branch 'master' of https://github.com/shahmeernavid/Facebook-Hackathon-2014-TicCeption
Fix the filled square bug
shahmeer
"shahmeer"
"insert"
ivhvkhvbvmnb
"omg work"
"hello"
Merge branch 'master' of https://github.com/shahmeernavid/Facebook-Hackathon-2014-TicCeption

Conflicts:
	index.html
ui
added gitignore
rm node_modules
added semi-functional server 

To run on heroku, this needs a procfile that points to it. More information can be found at 
https://devcenter.heroku.com/articles/getting-started-with-nodejs
Update and rename index.html to index.html\
Rename index.html\ to index.html
Final Commit
Merge branch 'master' of https://github.com/shahmeernavid/Facebook-Hackathon-2014-TicCeption
Add favicon