Merge pull request #20 from jteplitz602/recruiting

Added recruiting notice
Added hackspace workshop content
fixed typo
Merge pull request #21 from jteplitz602/master

Hackspace Workshop Content
added mehran to BoA
Cleaning up, resetting port back to 80
added akkina to BoA
Merge branch 'master' of https://github.com/gshubham/bases_website
Added BASES application link
Added registration link
Added git ignore
Working on hackspace terminal
Merge branch 'master' into recruiting

Conflicts:
	public/.DS_Store
	public/stylesheets/hackspace.css
	public/stylesheets/style.css
	views/index.jade
	views/programs/hackspace.jade