Sinatra-based student database / functionality
Merged .gitignore conflicts

Conflicts:
	.gitignore