Initial Commit
Merge branch 'master' of github.com:novicehacks/site-project

Conflicts:
	.gitignore