Added Proposal 1
Edited RSS Feed/Blog link to merge in two separate blogs - my official one I use for Latinforimagination and a backup one I can post class assignments to.
This should give me more freedom to do assignments and to more concise posts about what I'm doing/have been experimenting with recently, without spending a lot of time worrying about making them a perfect fit for the official blog.

Overlap should be less of an issue to deal with, and more of an opportunity with new posts.
The hope is that for some topics, ie, the research I'm doing on FOSS design practices, I can write less formal posts on the backup blog and link to things like transcripts - that will give people in the class/my network more of an opportunity to weigh in on what's going on.
When I'm at the point where I want to write a formal paper to post on the blog/gamasutra, I can do that without worrying about readers already having been flooded with the content.

Signed-off-by: Daniel Shumway <shumway.danny@gmail.com>
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from decause/master

Update fork
Added commcont1 and commcont2
Set up new blog system that works better for the main class.
Maintaining two blogs and combining them into a singular feed/webpage allows a number of advantages :

- I don't have to worry about overposting on the main blog.
- I don't have to worry about keeping styles consistent between company posts and class posts.
- I have a greater freedom of what I can post about on the FOSS blog, and what I can reference on it.
- I can still tag posts from the main blog and submit them to the class.
- When I do submit posts to the class, I can present them next to non-class posts - this way:
	people reading can use the RSS feeds to get *only* the FOSS posts.
	but when they go to the blogs, they'll be able to also see the other posts.



Signed-off-by: Daniel Shumway <shumway.danny@gmail.com>
Accidentally copied in Humanitarian Foss links instead of Adv. Foss

Signed-off-by: Daniel Shumway <shumway.danny@gmail.com>
Community contribution for Wikipedia

Signed-off-by: Daniel Shumway <shumway.danny@gmail.com>
added commcont3
Merge remote-tracking branch 'upstream/master'
added commcont4
Added hackprop2 to pxlbuzzard.yaml
Added hackprop2.
-Fix link to blog (somehow got reverted to threebean's)
I hope this isn't late.
I had some trouble coming up with something to do this time, but I eventually settled on finishing up the viral functions I had started earlier.
I have most of the bugs worked out, so this will be putting together the code and bundling it into something actually useful.
There's still a fair amount to write, but this will mostly be me focusing on bugs, testing, and documentation, which I didn't really do much with the last project.

Signed-off-by: Daniel Shumway <shumway.danny@gmail.com>
Merge pull request #59 from ColdenCullen/master

Added Hack Proposal 2
Merge pull request #58 from PxlBuzzard/patch-1

Added hackprop2 to pxlbuzzard.yaml
Merge pull request #42 from danShumway/master

Splitting and merging blogs for better organization
Merge pull request #40 from qwertos/commcont

Added commcont1 and commcont2
Added assignments to participant page templates