Commented functions file
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
created expert page
spring cleaning
Merge pull request #33 from lanejo01/master

spring cleaning
initial Prostatys commit
I now have set up the proper directories for static content, templates, and media. This is almost where we ended last semester with amount of files but it is far better organized.
Gents, we have a feed.
uncommitted changes made
Added some style to the feed
Merge pull request #35 from zaschim/master

Updated feed
Merge remote-tracking branch 'upstream/master'

Conflicts:
	FluxFrame2/FluxFrame2/settings.py
	FluxFrame2/FluxFrame2/wsgi.py
	FluxFrame2/settings.py
	FluxFrame2/settings.pyc
	FluxFrame2/urls.py
	FluxFrame2/wsgi.py
	FluxFrame2/wsgi.pyc
	Prostatys/Prostatys/settings.py
	Prostatys/Prostatys/wsgi.py
	Prostatys/expert_feed/models.py
	Prostatys/expert_feed/tests.py