notori0us

$ diff classes/tokenizer.rb ../project2/tokenizer.rb 
9d8
< require 'singleton'
12,13c11
< 	include Singleton
< 	def setFile(filename)
---
> 	def initialize(filename)

notori0us

---
title: Copyright
---
<div class="row" id="past-winners">
   <div class="small-12 large-12 column">
      <p>Content on this website, excluding OSU and company sponsors are copyright 2014
      The Open Source Club at The Ohio State University, and are freely available for use
      under a
      <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution Share Alike License</a></p>
    </div>

notori0us

[chris@aquarius] [~/webdev/hackathon-website]
$ git branch dev
[chris@aquarius] [~/webdev/hackathon-website]
$ git checkout dev
Switched to branch 'dev'
[chris@aquarius] [~/webdev/hackathon-website]
$ git fetch origin
[chris@aquarius] [~/webdev/hackathon-website]
$ git merge origin/dev
Auto-merging source/layouts/layout.erb