Merge pull request #140 from SUNY-Albany-CCI-INF362/master

adding everyone elses changes to my branch
Merge pull request #159 from SUNY-Albany-CCI-INF362/master

updating my branch with master
Removing dates from js

Removed dates from javascript. Refreshed CSS
Huge update for multiple devices
Merge pull request #164 from SUNY-Albany-CCI-INF362/timeline-edits(4/23/14)

Timeline edits(4/23/14)