added controller files to this index
minor change to mlintro to move controller reference
Merge pull request #16 from chughes87/master

Adds placeholder for features
Merge branch 'master' of https://github.com/GalaxyQuest/GalaxyQuestWebsite

Conflicts:
	views/index.html
minor changes; start on the boundary lines
Merge pull request #17 from jgpettibone/master

a few website changes; preparing for additions
Merge pull request #18 from chughes87/master

Adds feature circles to the top of the page with random highlighting
merges vinnie's work
Merge branch 'master' into HEAD

Conflicts:
	views/index.html
minor changes made