gitignore
samsonbranch pull
commiting .template files? wtf??
Merge branch 'master' of https://github.com/OPUSNYC/opus_dopusNYC
removed development
removed development
git ignore
merge? merde?
changed sdk location
Merge branch 'junwoo' of https://github.com/OPUSNYC/opus_dopusNYC into samson

Conflicts:
	.gitignore
	src/js/leapto.js
	src/welcome.html
edited gitignore
First backend functionality
deleted github stuff
I commit too much
Merge branch 'samson'
removed development
edited forge message
Merge branch 'samson'
Merge branch 'master' of https://github.com/OPUSNYC/opus_dopusNYC