Initial commit
Merge branch 'master' of https://github.com/nayak16/Penn-Apps-Fall-2014-Pond
Merge branch 'master' of https://github.com/nayak16/Penn-Apps-Fall-2014-Pond
Merge branch 'master' of https://github.com/nayak16/Penn-Apps-Fall-2014-Pond
Basic UI
Merge branch 'master' of https://github.com/nayak16/Penn-Apps-Fall-2014-Pond

Conflicts:
	pond/pond_app/static/css/bootstrap.css
	pond/pond_app/static/css/bootstrap.min.css
	pond/pond_app/static/fonts/glyphicons-halflings-regular.eot
	pond/pond_app/static/fonts/glyphicons-halflings-regular.svg
	pond/pond_app/static/fonts/glyphicons-halflings-regular.ttf
	pond/pond_app/static/fonts/glyphicons-halflings-regular.woff
	pond/pond_app/static/index.html
	pond/pond_app/static/js/bootstrap.js
	pond/pond_app/static/js/bootstrap.min.js
	pond/pond_app/static/js/jquery-1.11.0.js
	pond/pond_app/static/js/pond.js
Updates in UI
Attempt at a fix
Merge branch 'master' of https://github.com/nayak16/Penn-Apps-Fall-2014-Pond

Conflicts:
	pond/pond_app/static/css/bootstrap.css
	pond/pond_app/static/css/style.css
	pond/pond_app/static/index.html
	pond/pond_app/static/js/pond.js
Merge branch 'master' of https://github.com/nayak16/Penn-Apps-Fall-2014-Pond
Reorganized diretory structure